From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 10 Mar 2020 12:23:17 +0000 (+0100)
Subject: windowManager: Do not shutdown ibus/xsettings on X11 compositor restart
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~145
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=72c4f148ef88b4bffb2106b99434da5c05c0bb64;p=gnome-shell.git

windowManager: Do not shutdown ibus/xsettings on X11 compositor restart

These paths are meant for Xwayland, not for X11 compositors being restarted
through alt-f2 + r. Maybe some signal analogous to init-xserver should be
added for Xwayland shutdown paths, but this signal we are currently
listening for is backend agnostic.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329
---

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 8f0e8943d..21c63b5c3 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -924,6 +924,8 @@ var WindowManager = class {
             return true;
         });
         global.display.connect('x11-display-closing', () => {
+            if (!Meta.is_wayland_compositor())
+                return;
             Shell.util_stop_systemd_unit('gsd-xsettings.target', 'fail');
             IBusManager.getIBusManager().restartDaemon();
         });